install/ostree: Set zipl as the bootloader for s390x#2152
Merged
jmarrero merged 1 commit intobootc-dev:mainfrom Apr 23, 2026
Merged
install/ostree: Set zipl as the bootloader for s390x#2152jmarrero merged 1 commit intobootc-dev:mainfrom
jmarrero merged 1 commit intobootc-dev:mainfrom
Conversation
![gemini-code-assist[bot]](https://avatars.githubusercontent.com/in/956858?s=60&v=4){kind=small}
Contributor
There was a problem hiding this comment.
Code Review
This pull request introduces a configuration step to set 'zipl' as the bootloader for s390x architectures within the ostree repository. A review comment identifies that the configuration key used should be 'sysroot.bootloader' rather than 'bootloader' to ensure it is correctly placed in the configuration file. Additionally, it was suggested to integrate this change into the existing configuration loop to improve efficiency by avoiding an extra process execution.
jbtrystram
force-pushed
the
s390x_set_zipl
branch
5 times, most recently
from
bc55aeb to
f71e408
Compare
|
Right, we do the same in cosa : https://github.com/coreos/coreos-assembler/blob/main/src/osbuild-manifests/build.common.ipp.yaml#L165 |
jbtrystram
force-pushed
the
s390x_set_zipl
branch
2 times, most recently
from
fffc668 to
1979ad0
Compare
`zipl` cannot dynamically read BLS config at boot, and requires the MBR to be updated before. So we set `zipl` as the bootloader for s390x by default. Otherwise, s390x systems cannot reboot into new deployments. We set the ostree parameter after the initial ostree deployement because it fails if called during it. See https://github.com/coreos/coreos-assembler/blob/99bb23e7dfbfa8f1ae8b9bfaca9ff2e6d98c6cba/src/osbuild-manifests/build.common.ipp.yaml#L160-L163 Fixes bootc-dev#2151 Signed-off-by: jbtrystram <jbtrystram@redhat.com>
jbtrystram
force-pushed
the
s390x_set_zipl
branch
from
1979ad0 to
18196bd
Compare
Contributor
Author
|
A build with this passes coreOS tests that were failing : |
jbtrystram
added a commit
to jbtrystram/fedora-coreos-config
that referenced
this pull request
Apr 21, 2026
This reverts commit 90a6d6e. In 10f346e we switched rawhide to use `bootc install to-filesystem` to create our disk images. This was reverted in 90a6d6e because of s390x issues. A PR with the fix is now opened in bootc : bootc-dev/bootc#2152 and the tests denylisted in coreos#4117 so let's revert the revert to enable this again.
jbtrystram
added a commit
to jbtrystram/fedora-coreos-config
that referenced
this pull request
Apr 21, 2026
In coreos@10f346e we switched rawhide to use `bootc install to-filesystem` to create our disk images. This was reverted in coreos@90a6d6e a PR with the fix is now opened in bootc : bootc-dev/bootc#2152 so let's denylist those tests so we can re-enable `bootc install` for rawhide.
jbtrystram
added a commit
to coreos/fedora-coreos-config
that referenced
this pull request
Apr 21, 2026
This reverts commit 90a6d6e. In 10f346e we switched rawhide to use `bootc install to-filesystem` to create our disk images. This was reverted in 90a6d6e because of s390x issues. A PR with the fix is now opened in bootc : bootc-dev/bootc#2152 and the tests denylisted in #4117 so let's revert the revert to enable this again.
joelcapitao
pushed a commit
to coreos/fedora-coreos-config
that referenced
this pull request
Apr 21, 2026
In 10f346e we switched rawhide to use `bootc install to-filesystem` to create our disk images. This was reverted in 90a6d6e a PR with the fix is now opened in bootc : bootc-dev/bootc#2152 so let's denylist those tests so we can re-enable `bootc install` for rawhide.
cgwalters
approved these changes
Apr 22, 2026
Collaborator
cgwalters
left a comment
cgwalters
left a comment
There was a problem hiding this comment.
Hmm...I think the real regression here might have been that we set bootloader = none unconditionally in the install logic but we should have actually let it be the default?
It may even be that since ostreedev/ostree#3104 zipl would work for the initial deployment too, but we never updated the logic to just entirely drop setting the boot loader on s390x (letting the internal ostree default work).
Anyways, since this matches what's done in cost, sounds fine to me.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
ziplcannot dynamically read BLS config at boot, and requires the MBR to be updated before. So we setziplas the bootloader for s390x by default. Otherwise, s390x systems cannot reboot into new deployments.See #2151